Auto merge of #3171 - alexcrichton:travis, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 7 Oct 2016 17:55:46 +0000 (10:55 -0700)
committerGitHub <noreply@github.com>
Fri, 7 Oct 2016 17:55:46 +0000 (10:55 -0700)
commitb890f3f44d7d266e3ed951f6beb884331c526049
tree4e9a8946769101a08635b3ab34a858199d19692d
parent248968735e4e9bea3489981750c3f81920aeb8fa
parent96fafda8f472c5d3452ba0d823476845f4efd1fb
Auto merge of #3171 - alexcrichton:travis, r=alexcrichton

Fix Travis OSX

They recently changed images, gotta tweak how we work with OpenSSL